From 3b8a264a5efbd2509d1286c9c367ec181cf34356 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 18 Oct 2010 19:01:55 +0200 Subject: [PATCH] print: Make things compile again Remove workaround for entries - the general codepath should just work. --- gtk/gtkprinteroptionwidget.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c index 8349d2c8bb..28cc5bfba8 100644 --- a/gtk/gtkprinteroptionwidget.c +++ b/gtk/gtkprinteroptionwidget.c @@ -372,18 +372,11 @@ combo_box_get (GtkWidget *combo) gchar *value; GtkTreeIter iter; - if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (combo))) - { - value = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo)); - } - else - { - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); + model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); - value = NULL; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) - gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1); - } + value = NULL; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) + gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1); return value; } -- 2.30.2